Fix a typo
authorMatthias Clasen <mclasen@redhat.com>
Wed, 28 Jan 2015 15:08:13 +0000 (10:08 -0500)
committerMatthias Clasen <mclasen@redhat.com>
Wed, 28 Jan 2015 15:08:13 +0000 (10:08 -0500)
commit aa1b7fab9c6a2b39 introduced a misuse of G_UNLIKELY in
several places. Fix all those.

gtk/gtktextview.c
gtk/gtktreeview.c
gtk/gtkwidget.c

index 6d0777cc16fc30ddd9709e1d3e480098352b83a6..a61dd1ed5ec19f5c2ceb005d1748f1af9b8e15b5 100644 (file)
@@ -4461,7 +4461,7 @@ gtk_text_view_style_updated (GtkWidget *widget)
   GtkStyleContext *style_context;
   const GtkBitmask *changes;
 
-  if (G_UNLIKELY (affects_font) == NULL)
+  if (G_UNLIKELY (affects_font == NULL))
     affects_font = _gtk_css_style_property_get_mask_affecting (GTK_CSS_AFFECTS_FONT);
 
   text_view = GTK_TEXT_VIEW (widget);
index 7b97c0023d8277044009f6cf2d1229de8adb641f..f43231f50dc73bf5a14a5589e2874ec753a33dc6 100644 (file)
@@ -8707,7 +8707,7 @@ gtk_tree_view_style_updated (GtkWidget *widget)
   GtkStyleContext *style_context;
   const GtkBitmask *changes;
 
-  if (G_UNLIKELY (affects_size) == NULL)
+  if (G_UNLIKELY (affects_size == NULL))
     affects_size = _gtk_css_style_property_get_mask_affecting (GTK_CSS_AFFECTS_SIZE | GTK_CSS_AFFECTS_CLIP);
 
   GTK_WIDGET_CLASS (gtk_tree_view_parent_class)->style_updated (widget);
index b7fa3670a5ad0c03c56ee9942e4639d066b28644..fc1d2ff88e97f0f36dbb555daed17e45e9732948 100644 (file)
@@ -8231,7 +8231,7 @@ gtk_widget_real_style_updated (GtkWidget *widget)
         {
           static GtkBitmask *affects_size = NULL;
 
-          if (G_UNLIKELY (affects_size) == NULL)
+          if (G_UNLIKELY (affects_size == NULL))
             affects_size = _gtk_css_style_property_get_mask_affecting (GTK_CSS_AFFECTS_SIZE | GTK_CSS_AFFECTS_CLIP);
 
           if (changes == NULL || _gtk_bitmask_intersects (changes, affects_size))